From: Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
Date: Fri, 13 May 2016 00:31:37 +0000 (+0530)
Subject: remove deprecated attr - change connect() to join()
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~14^2~16^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=2a4776c0c3fb6a66bae354a245303185199e1909;p=cargo.git

remove deprecated attr - change connect() to join()
---

diff --git a/tests/support/mod.rs b/tests/support/mod.rs
index 3ba8be881..61abc6a39 100644
--- a/tests/support/mod.rs
+++ b/tests/support/mod.rs
@@ -349,7 +349,6 @@ impl Execs {
                        "stderr", &actual.stdout, false)
     }
 
-    #[allow(deprecated)] // connect => join in 1.3
     fn match_std(&self, expected: Option<&String>, actual: &[u8],
                  description: &str, extra: &[u8],
                  partial: bool) -> ham::MatchResult {
@@ -385,7 +384,7 @@ impl Execs {
                     format!("differences:\n\
                             {}\n\n\
                             other output:\n\
-                            `{}`", diffs.connect("\n"),
+                            `{}`", diffs.join("\n"),
                             String::from_utf8_lossy(extra)))
 
     }
diff --git a/tests/test_bad_manifest_path.rs b/tests/test_bad_manifest_path.rs
index ed6fc7c9a..0d8eb777e 100644
--- a/tests/test_bad_manifest_path.rs
+++ b/tests/test_bad_manifest_path.rs
@@ -16,11 +16,11 @@ fn assert_not_a_cargo_toml(command: &str, manifest_path_argument: &str) {
                                              to a Cargo.toml file")));
 }
 
-#[allow(deprecated)] // connect => join in 1.3
+
 fn assert_cargo_toml_doesnt_exist(command: &str, manifest_path_argument: &str) {
     let p = project("foo");
     let expected_path = manifest_path_argument
-        .split("/").collect::<Vec<_>>().connect("[..]");
+        .split("/").collect::<Vec<_>>().join("[..]");
 
     assert_that(p.cargo_process(command)
                  .arg("--manifest-path").arg(manifest_path_argument)